Replace individual test suite component checks with global one