Merge "Fix that required tests are skipped"