Added GUI and Test Classes