Build Fix: Fixed all the maven tests