Try to match old TestOptions::hasSameInitializationOptions a little closer
Created attachment 411017 [details] Patch
Created attachment 411018 [details] Patch