More Python 3 changes

Some more python 3 changes, mainly limited to the tests themselves. Some None < 0 type fixes too.