[#64241148] Smokey test changes