Some rewritten tests