Update macros in main. DUMP is now a macro to save space/noise and the PASS macro now runs checkInvariants afterwards if --invariant is on.