Change Password Modal & Tests

Fixes #735 #20 #19

Refactored some tests. Refactored some templates.