Update the test suite to match the new tag names.