Moved tests around to match schema