test case optimizations based on feedback from Aslak Knutsen