Merge "Add AsyncInstantiationController tests"