Fix existing scan tests; add gin