Modify tests for the previous interface change