Fix waiting tests

tests didn't complete because error tracking was disabled at that point