[DS-1738] Reflect changes in MockDatabaseManager too.  Provide unit tests.