Reorganize Tests, Tests for CollectionAPI/ProjectAPI Attributes