db
more tests, fix collection loading and parsing