A few more manual fixes for style E501, etc. errors in testing package