Adjust some tests for APIv2
Fix conflicts
Disregard some tests and remove APIv4