Fix failing tests

this is to fix the currently falling tests on master of the repository.
now the all the integration tests are passing