Updated tests for new api.