Reduce unit test execution time (by 50%)

Reduce unit test execution time (by 50%) #1648