More test fixes. Better expectations in many combinator