Revert some tests