Fix unit tests after Tag move