Merge "Adding missing @group Database to unit tests"