Remove the dependency on unittest2