refactor to get ready for simple password demo
refactor to get ready for simple password demo
fix for passwords adapter test