More rewritten tests