Fix missing return in trySwitch
switch fix
Comment some tests