Supressed warnings from mocks
Refactor database file writers and readers