FIX: test with new api