Fix some tests
Add a couple methods to schema