Removed MultiGUI test, minor changes