Order deletion tests added
Gemfile.lock updated
Conflicts fixed