Fixed schema, and unit test.