[TIMOB-16684] Fixed unit tests to pass.