Updated maven dependency versions
Refactored and fixed the tests