Update tests for new API