Updated tests.
Style fixes.
Merge branch 'master' into change-password