FIX TESTs:  add subjects_dir parameters
Merge pull request #660 from christianmbrodbeck/fix-subdir

FIX TESTs:  add subjects_dir parameters