Fix functonal tests
Adjust some tests for APIv1