Updated tests to latest API