refactor tags and tests
Merge pull request #2 from tutumcloud/staging

refactor tags and tests