Fixed the unit test that were failing for -I. Also added support for -C