Added --version to command line. Few minor cleanups in the testing environment.