Fix build lifecycle

Make the tests green again, in all environments