Added a few more tests around tags