diff --git a/test/unit_test/model/token/day_password_test.dart b/test/unit_test/model/token/day_password_test.dart
index 5c095baf..1c3d2268 100644
--- a/test/unit_test/model/token/day_password_test.dart
+++ b/test/unit_test/model/token/day_password_test.dart
@@ -186,7 +186,7 @@ void _testDayPasswordToken() {
       expect(uriMap[Token.IMAGE], 'example.png');
       expect(uriMap[OTPToken.ALGORITHM], 'SHA1');
       expect(uriMap[OTPToken.DIGITS], '6');
-      expect(uriMap[OTPToken.SECRET_BASE32], Encodings.base32.encode(utf8.encode('secret')));
+      expect(uriMap[OTPToken.SECRET_BASE32], 'secret');
       expect(uriMap[TOTPToken.PERIOD_SECONDS], '86400');
     });
     test('fromJson', () {
diff --git a/test/unit_test/model/token/hotp_token_test.dart b/test/unit_test/model/token/hotp_token_test.dart
index 394b9f43..efc22596 100644
--- a/test/unit_test/model/token/hotp_token_test.dart
+++ b/test/unit_test/model/token/hotp_token_test.dart
@@ -175,7 +175,7 @@ void _testHotpToken() {
       expect(uriMap[Token.PIN], Token.PIN_VALUE_TRUE);
       expect(uriMap[Token.IMAGE], 'example.png');
       expect(uriMap[OTPToken.ALGORITHM], 'SHA1');
-      expect(uriMap[OTPToken.SECRET_BASE32], Encodings.base32.encode(utf8.encode('secret')));
+      expect(uriMap[OTPToken.SECRET_BASE32], 'secret');
       expect(uriMap[OTPToken.DIGITS], '6');
       expect(uriMap[HOTPToken.COUNTER], '1');
     });
@@ -187,7 +187,7 @@ void _testHotpToken() {
         'type': 'HOTP',
         'algorithm': 'SHA256',
         'digits': 8,
-        'secret': 'ONSWG4TFOQ======',
+        'secret': 'secret',
         'counter': 5,
         'pin': false,
       };
@@ -197,7 +197,7 @@ void _testHotpToken() {
       expect(hotpFromJson.issuer, 'issuer');
       expect(hotpFromJson.algorithm, Algorithms.SHA256);
       expect(hotpFromJson.digits, 8);
-      expect(hotpFromJson.secret, 'ONSWG4TFOQ======');
+      expect(hotpFromJson.secret, 'secret');
       expect(hotpFromJson.type, 'HOTP');
       expect(hotpFromJson.pin, false);
     });
diff --git a/test/unit_test/model/token/push_token_test.dart b/test/unit_test/model/token/push_token_test.dart
index 1ede049d..4c59948c 100644
--- a/test/unit_test/model/token/push_token_test.dart
+++ b/test/unit_test/model/token/push_token_test.dart
@@ -222,10 +222,9 @@ void _testPushToken() {
       expect(uriMap[Token.LABEL], 'label');
       expect(uriMap[Token.ISSUER], 'issuer');
       expect(uriMap[Token.SERIAL], 'serial');
-      expect(uriMap[PushToken.SSL_VERIFY], 'True');
+      expect(uriMap[PushToken.SSL_VERIFY], '1');
       expect(uriMap[PushToken.ENROLLMENT_CREDENTIAL], 'enrollmentCredentials');
       expect(uriMap[PushToken.ROLLOUT_URL], 'http://www.example.com');
-      expect(uriMap[PushToken.TTL_MINUTES], '30');
       expect(uriMap[PushToken.VERSION], '1');
     });
     test('fromJson', () {
diff --git a/test/unit_test/model/token/steam_token_test.dart b/test/unit_test/model/token/steam_token_test.dart
index a178012a..2adbad19 100644
--- a/test/unit_test/model/token/steam_token_test.dart
+++ b/test/unit_test/model/token/steam_token_test.dart
@@ -114,9 +114,9 @@ void _testSteamToken() {
         expect(totpUriMap[Token.LABEL], 'label');
         expect(totpUriMap[Token.ISSUER], 'issuer');
         expect(totpUriMap[Token.OTPAUTH_TYPE], 'STEAM');
-        expect(totpUriMap[Token.PIN], false);
+        expect(totpUriMap[Token.PIN], 'False');
         expect(totpUriMap[Token.IMAGE], 'example.png');
-        expect(totpUriMap[OTPToken.SECRET_BASE32], 'ONSWG4TFOQ======');
+        expect(totpUriMap[OTPToken.SECRET_BASE32], 'secret');
       });
       test('fromJson', () {
         final steamJson = {
diff --git a/test/unit_test/model/token/totp_token_test.dart b/test/unit_test/model/token/totp_token_test.dart
index 74cf010a..7368a8d5 100644
--- a/test/unit_test/model/token/totp_token_test.dart
+++ b/test/unit_test/model/token/totp_token_test.dart
@@ -167,12 +167,12 @@ void _testTotpToken() {
       expect(totpUriMap[Token.LABEL], 'label');
       expect(totpUriMap[Token.ISSUER], 'issuer');
       expect(totpUriMap[Token.OTPAUTH_TYPE], 'TOTP');
-      expect(totpUriMap[Token.PIN], false);
+      expect(totpUriMap[Token.PIN], 'False');
       expect(totpUriMap[Token.IMAGE], 'example.png');
       expect(totpUriMap[OTPToken.ALGORITHM], 'SHA1');
-      expect(totpUriMap[OTPToken.DIGITS], 6);
-      expect(totpUriMap[OTPToken.SECRET_BASE32], 'ONSWG4TFOQ======');
-      expect(totpUriMap[TOTPToken.PERIOD_SECONDS], 30);
+      expect(totpUriMap[OTPToken.DIGITS], '6');
+      expect(totpUriMap[OTPToken.SECRET_BASE32], 'secret');
+      expect(totpUriMap[TOTPToken.PERIOD_SECONDS], '30');
     });
     test('fromJson', () {
       final totpJson = {