Update Users Tests
Orders Controller
Merge branch 'master' into TeaPane
Update User Test