Update the tests
Merge branch 'feature/last-login-notice' into develop

* feature/last-login-notice:
  Update the tests