fix tests, adapt to new api