Moved require machine_tag to function that requires it.  Updated the comments on the tag tests.