Merge "Fix some issues about AMS creation in tests."