house keeping
DefaultDirectory fix for files, tests added