Corrected assertion order
Making code more DRY