Ticket #24280 - Fix for unit tests.