the interface of the 3p3c tests is adapted to next
Makes the tests compile but not necessarily pass yet (unfortunately :()