Toss tests into right place