cleanup unittest, tests passed for python3