Test improvements
Command line arguments