changes for repairing almost all tests in the project