testing: More restructuring for the Nose source