#48
More unit tests, more schema collections added