Fixes test ordering issue