[BUG #8315] Fixed broken unit tests.