Moved tests querying critter entity to CritterQueryTests.