fix-failing-tests

Please merge this pull request.