[BUG #8691] Fixed unit tests.