Test rewritten to be more readable