Fix existing tag filepath too. This all needs test coverage
Minor spec cleanup. Build still failing