Maven dependencies reorganization
Refactoring
Additional tests
Additional error message