rewritten tests