Merge "@covers tags for the rest of test files.."