adjusted tests to compensate for combinator modifications