added more complex object and unit tests

get rid of some of this whitespace