Squashed db to save testing time
Merge pull request #231 from etingel/squash-test-db-reset

Squashed db to save testing time