Fixing up the unit tests
Integrate nifty system to toggle statement skipping from code coverage conditional to python 2.x vs 3.x tests.