Submitted by: mfosterw
I made a brittle and difficult to understand test, so I fixed it by adding a branch and a bit more checking