Fixed dumb bug and made test more robust

Related to Issue #462.  Found a dumb bug in my code that was missed during review (CPP test was returning without running the test).  Also, after some more testing I changed the parameters a bit to make it even less likely to have intermittent failures while still being a good test.  Cleaned up comments and fixed all pylint issues. I've run it about a 100 times now with no failures, so hopefully we're in decent shape at least for this test.