Revert back changes in tests