added new command line options for better control over tests