updated to run commandline processing after bypass processing
updated test cases