more tests and tweaks for ExtractCigar