Removed count, fixed py3 tests.