separate out object types to their own file, update tests
separate out object types to their own file, update tests