Fix tests for tagging