Merge "Speed up password-handling in the unit tests"