Fixes a few more tests in such a way that they should pass on multiple Python versions