Remove needless dependency on unittest2
Fix package dependencies