Current user is resetting on index; updated tests