Tests pass and fewer mysterious defers