fix test ordering issues