Clean up and standardize ObjectType tests.