Fix file sink module's file name suffix for the tests
Fix AggregateCounter shell command option handling