fix the tests affected by this PR, but still tests are failing