Add more tests for tagging