Fix more tests for new API. Refs #6614
Remaining fixes for v2 API tests. Refs #6614
Merge branch 'feature/6614_api_migrate' into develop