Re-enabled SkipScanFilterTest and fixed lots of skip scan bugs