Added loaned out and refactored schema tests