As for the test change, the way things will help more with debugging, because we'll know if attach at least happened once or not.