Ending attempt to modularize GC; too big impact at this stage; adding simple unit test