Fixes tests amd reset password
Test fixes