Improve test coverage of DatabaseSaver and DatabaseLoader