Remove v2 references in test