fixes for forgotten password test, refactor of deprecated methods

Please add space before {