Fix option name
Fix tests
Fix segmentation_test
Complete fix tests