Fixing test ordering problem