Add macro support to -be expansion test mode. Bug 1623