Refactored tests
Fixed maven dependencies