Add more tests of tagging