GUI-1079: Fix failing tests