Updated tests for new API