Quick fix of the test failures. Will fix this properly