Fix failing tests

this is to fix the currently falling tests on master of the repository.

one fixed one more to go.