Got the tests to pass with new schema.