Remove some tests related to the prior revert