fixed tests, added unittest2 for python2.6