Also updated tests and GUI using 2to3