Fix test ordering