Move away from afterEach for expectations

The ordering between multiple afterEach blocks isn’t guaranteed, so
just run any expectations inline.
For “long delay” test, wait longer than the delay