Update tests to be python3 compatible