Changing test for attributes, adding gateway attr