Merge "Add missing @group Database tags in tests"