Update tests to use latest API