made the satisfaction tests pass with latest c.l and typechecker changes