[PATCH 2/3] Update unittests for distuils and optional virtualenv integration