Fixing failing GUI tests