Added new versions of junit and refactored code
Fixed the tests