Merge "rdbms: Refactor DatabaseTest"