Revert previous changes to remove unnecessary tests.