Fixed bugs, finished JUnit