Fixed schema. Working on unit tests.