Moved waitForCompletion methods to ShellTest