Housekeeping - Updated test ordering