More refactoring work to be able to filter tests by custom tags