Credit where credit is due :-)
Minimized test cases.