fixing staggering and numbering of tests