Use namespace for CLI_ERROR
Added comments
Make testing of LSF data storage aware extension optional
Factor out test argument
Updated copyright