Fix to tests
Forgot progress bar
Fix to staff page test
Merge Conflict