fixed one test, but split one test into 5 (4 fail), so overall error count went up, but result is actually better.  current count: 22F 31E