Added JUnit
All tests pass, good to go