Fix up unit tests after /v2 changes

Signed-off-by: Ken Barber <ken@bob.sh>