factor staff checks into existing tests