Comb up the tests