clean up tests and remove dependency on unittest2