[ticket/11584] Fix problem with unit tests