Cleanup of test code
Cleaning up core
loading files fixes
Fixed loading of schema files