Add test of Selection
Add hook to set password