moved tests around