Merge "Add @covers for main Database test types"