am 2b828ef: AI 147464: Some small bugfixes for the core tests.

Merge commit '2b828ef0e241e67319349a30285ee7b812173040' into donut

* commit '2b828ef0e241e67319349a30285ee7b812173040':
  AI 147464: Some small bugfixes for the core tests.