Test fixes

Do not try to use CLI options in tests if not available