Simplify and speed up pipeover
Increase test count to better profile time