refactored tags to use setup and teardown