Clean up
Fix Python < 2.7 testing