Moving some tests around.