Fix TestAttachAfterDetach to work with latest client Upstream-commit: c6513bd05170ad3b77def3ae50541ef50d2ad27d Component: engine