refactor tags and tests