Adapt to API changes in Tulip

Test suite doesn't fully run yet, more changes are needed