Merge "Skip scenario tests early to avoid unnecessary setup"