Issue #11 Moved commons-lang3 to test scope, refactored dependent code