Mockdb

Merging mocked database to develop, all tests passing