Remove commented-out code
Move Genshi adapter/test dict out of try block.