fix the gui-diff macro and its test

Fix obvious problem with macro version of gui-diff I added,
and improve the test:
 1. verify the macroexpansion
 2. stub out the called function so it doesn't launch the diff when the test runs.