Add Graphical JUnit Tests + Fix Issue (2)