Modify test so it doesn't expect an initial directory on filesystem

Remove some debug prints, augment error output
A few other tweaks