Further incompatibility fixes and mods

* install and use unittest2 for 2.6 tests