Added missing gui tests + small refactoring.