Pass through /test/ in SwitchStatement handler
Update tests