SI-7622 Clean Up Phase Assembly

Superseding the preceding PR, this is a test probe that still includes partest commits.