Add storage passwords tests; various nits