Fixed somethings; Added JUnit file