Fix #115 expected args count whether --file option is passed or not and
add tests