Updating tests for new API