Fixes two recently introduced problems with SMT configuration
Needs part of !908 (merged) to be complete (otherwise selected unit tests don't work with SMTs enabled).
Needs part of !908 (merged) to be complete (otherwise selected unit tests don't work with SMTs enabled).