Revert some changes in tests.