test reusability & exception clarification & fixes