Test v2 signature changes. DONTBUILD