Added Mockito for testing.
Moved to JUnit4.
Apache commons dependencies updated to latest stable releases.