[HotFix] Email verification corrected, unit tests updated