Don't rely on setTimeout bugs + test cleanup

Can we comment these out for now?