Merge "Do not turn on imes unexpectedly with unit tests"