Split tests into more distinct checks