Adapted to API changes in Tulip

Some tests are still failing though