Refactored combinator tests to match the combinator trait set