Fixing some tests (TODO - change acceptance tests to use test database)