Could you remove the disabled test code (here and at lines 282, 296, & 310)?