Re-enable switch test cases and fix regressions

30376a82b2Luuk de Gram committed on 7/24/2021, 6:05:41 PMparent5d98abd
2 files changedLine totals unavailable