Add some more testing for tags