+ Added test GUI class
* Minor improvements