expanded and reordered tests