Move some test stuff around.