Add more tests and don't error on silly scrutinee vars