Remove guard decorator until better times
Attempt to port tests to Python 3
Merge remote-tracking branch 'origin/master'