Tests updated to require setting data_dir and id
Tests updated to require setting data_dir and id

Instead of allowing passing in 'path' as it is too hard to calculate them.

afresh1/xdeadly,thowe/xdeadly