Test and fix Gof3rSink