cleaned up tests, added tagging tests