Changes to comments layout by a quickly written script
Now tests also work when invoked with python2 explicitly