A few things moved outside of CCondor class
Additional error handling added to file parsers
More unit tests added