Merge "Remove DatabaseSqliteMock unit test class in favor of mocking"