reorganized test ordering