removed multiple 1000+ tests in prevision of cpu test refactors This commit could be fused with c0dbb037 for cleaner history