Moved tests around