Remove the use of global

This will also allow to enable the filters in the tests.