Merge "Fix test failure when checking if model is supported"