- Includes Factory and SingletonStore so our custom implementation is removed
- Inject SingletonStore to restrict the possible functions - Refactor PasswordSecurityTest to correspond to the usual way of testing