[#66150950] Add additional test cases and walkins.