removing discovery.py, we use unittest2 for backward compatibility with 2.6
Preparations for extracting configuration to outer files