Modified tests after changes from GUI-586