Revert test changes.

More work needs to be done to update tests.