Npower python3 misc#4

Another couple of patches to enable some more python3 tests, was hoping I could have a patch that just enabled tests but all the tests in the series nearly needed some changes. Trying to keep these patch sets at a reasonable size for ease of review (so a couple of more of these to go)