Added JUnit to the mix