Added command line flags for test