Guarding against issue in #19. Also fixes unit tests related to tagging to ensure they run as expected.
Merge pull request #44 from ozone-development/fixes-19

Guarding against issue in #19. Also fixes unit tests related to tagging