Rework test infrastructure to keep track of tests which are disabled