GUI-568: Fix failing tests