Minor usability fix for the library
Couple of schema fixes
Test updates
Implement last few tests