Oh yeah? Well I didn't want to run on your stupid non-2.7 versions of Python anyway.
Minor tweaks so tests themselves are 100% excercised.