Switch to testify, remove v1/v2