added users for tests
reformat code to meet coding guidelines