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

Fixes #19 by guarding against the issue. The original fix to #19 is really in #38.
Also updated unit tests to no longer fail.