Review fixes and test cases for select-new-api