Test and fix GC