Separated test db from dev, changed a couple of tests for the right results, verified working of fixtures
master pull
re-tested after master pull