bugfix test code
Merge branch 'login-bugfixes' into dev