Fixing afterEach getting called if waitsFor times out

When a test has runs and waitsFor blocks and one of the waitsFor blocks times out, afterEach does not get called. This can leave the test suite in a bad state.