Another fix for test ordering