Added 'discovery' module in order to support py26 unit tests running