get rid of diag in tests
update controller tests to ApiV2