Add password
Add more tests