Merge "Improve test coverage in includes/password"