BUG-4351: remove use of commons-lang3 in tests