Removed unneeded @Override
Updated junit and mockito dependencies to latest
Updated to commons-lang to version 3