Refactor tests order