move tests around