Commenting out additional tests to help debug