Port testsuite to new protocol