fixes to --tomb-pwd and new test script