Fixing test failures

I think that is possible