tidy ordering and context of tests prior to pr submission