More classes and unit tests, schema changes

More classes and unit tests, schema changes