Fix all the tests to work with new schema