Fix test
Merge branch 'vik/staff-refactor' into vik/peer-refactor
Get rid of timing