Revert some debugging tests