Fixed tests for GUI
Rebased assistants