Split into two files to allow both python 3 and 2 testing.
United into one file again supporting both pyton 3 and 2