- Fix test failures: do not use make_cond_after_sjm()'s result in case
  of merged SJ-Materialization lookup
- Update test results