GUI-876: Fix failing tests