moving some tests around