am 025322b: am 2b828ef: AI 147464: Some small bugfixes for the core test

Merge commit '025322b5586f76fb2b886700f7a01deaa5d513bd'

* commit '025322b5586f76fb2b886700f7a01deaa5d513bd':
  AI 147464: Some small bugfixes for the core tests.