Changed tests to use object, cleaned up white space.