- Merge TotpService into TotpAuthenticator - Add missing tests - Migrate old 2fa enabled key to new one