Improve loading schema, and test coverage
0.1.3