Fixes to add staff tests