Merge "Add @covers tags to database tests"