Merge "Fix MismatchError in tags API tests"