Updated GC unit tests.
Patched unit test and GC.  Also removed unit test macro.