Fixed bug failing to import for -c/-C statements.
Added a few more unit tests!.