Revert
Fix source directory - Tests
Easy mock dependency
Update tests for JUnit 4