Feature #5157 - fixing unit tests