Revert Spring version back to 3.1.x since mock tests fails, needs to take as another issue