Move tests into right block.