Fix unit tests for vnextapi