Added command-line arg and removed test