fixes for test failures and use -- in command line args