removing setTimeouts from some tests