s: Refactor tests