Revert changes made for tests