FIX: regression, forgot password broken

also... mocks were invented by the devil
FIX: tests to pass with badges enabled