GUI-1374: Fix for failing unit test