Cherrypicked test path reordering per Tal's request.