Issue #1426804 by drunken monkey: Adjusted to Core change in EntityUnitTestBase.