Allow an optional variant suffix in tests
Allow an optional variant suffix in tests

Fixes #3482 once the equiv change has landed in Flutter.

Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code