Low hanging fruit

Replace mocks with test database where it is easy to do.