More staff tests
About halfway through #127