updates tests to use test object constructors
fixes indentation