Moving some tests around. Need to have pure thread-sleep injection...