Rewritten tests