Fix py3 tests
Update tests