GUI-388: Fix failing unit tests