Fix testing to match new api