Port tests to combinator API (ongoing)