Remove duplicate tests.
Uniform password, minor fixes
Fixes for Windows-bootstrapping tests and minor fixes.