Repair unit tests for tagging