Added a test and changed some gui