Undid changes for tests that should not have been checked in.