Fix tests

Make the tests green again, in all environments