Separate GUI, add test for GUI