Remove references to macros which are no longer present
Add phase-test pattern.