Ensure v2 tests run. Minor fixes.