Issue #1666 maven tests were refactored.