Testing only, no need to make a hash dir
Tidy up testing sequence