Fix detection of unchanged files; fix creation of initial password file.
Fix the test suite.
merge