upgrading to unittest2