Fixes addressing inconsistent hashes of solutions which have been extended for SBE were applied only in the deferred engine selection case.

As this is soon to be the only engine selection path, there is little value in adding additional changes for the non-deferred path.

The test verifying behaviour should not run in non-deferred paths.