Added options to handle sig_test argument on main class