Fixed tests for apiV2