Updated test suite.

code needs a bit of work.  It seems that every ~20ish runs I've got 1-2 failed reads.
A bit of house cleaning