Reduce tests, some of them were redundant