added timing/reset order swapping in .when
tests working again