diff --git a/src/ServiceType/AbstractServiceTypeHandler.php b/src/ServiceType/AbstractServiceTypeHandler.php
index 7778dd9..9806125 100644
--- a/src/ServiceType/AbstractServiceTypeHandler.php
+++ b/src/ServiceType/AbstractServiceTypeHandler.php
@@ -12,7 +12,7 @@
 namespace AuthBucket\Push\ServiceType;
 
 use AuthBucket\Push\Model\ModelManagerFactoryInterface;
-use Symfony\Component\Security\Core\SecurityContextInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Validator\ValidatorInterface;
 
 /**
@@ -22,16 +22,16 @@
  */
 abstract class AbstractServiceTypeHandler implements ServiceTypeHandlerInterface
 {
-    protected $securityContext;
+    protected $tokenStorage;
     protected $validator;
     protected $modelManagerFactory;
 
     public function __construct(
-        SecurityContextInterface $securityContext,
+        TokenStorageInterface $tokenStorage,
         ValidatorInterface $validator,
         ModelManagerFactoryInterface $modelManagerFactory
     ) {
-        $this->securityContext = $securityContext;
+        $this->tokenStorage = $tokenStorage;
         $this->validator = $validator;
         $this->modelManagerFactory = $modelManagerFactory;
     }
diff --git a/tests/TestBundle/DataFixtures/ORM/ServiceFixture.php b/tests/TestBundle/DataFixtures/ORM/ServiceFixture.php
index f416313..432aa2c 100644
--- a/tests/TestBundle/DataFixtures/ORM/ServiceFixture.php
+++ b/tests/TestBundle/DataFixtures/ORM/ServiceFixture.php
@@ -27,21 +27,21 @@ public function load(ObjectManager $manager)
                 'host' => 'ssl://gateway.sandbox.push.apple.com:2195',
                 'local_cert' => <<<EOF
 -----BEGIN CERTIFICATE-----
-MIIFmzCCBIOgAwIBAgIIEK8htRc6Pt4wDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
+MIIFmzCCBIOgAwIBAgIIR9URu/EXwHgwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
 ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
 aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTQwOTA5MTI0NzM1WhcNMTUwOTA5MTI0NzM1WjCBmjErMCkGCgmSJomT8ixk
+HhcNMTUxMDAyMDMzMjU4WhcNMTYxMDAxMDMzMjU4WjCBmjErMCkGCgmSJomT8ixk
 AQEMG2NvbS5hdXRoYnVja2V0LnB1c2gtY29yZG92YTFJMEcGA1UEAwxAQXBwbGUg
 RGV2ZWxvcG1lbnQgSU9TIFB1c2ggU2VydmljZXM6IGNvbS5hdXRoYnVja2V0LnB1
-c2gtY29yZG92YTETMBEGA1UECwwKVjUyOVhFUE1YVDELMAkGA1UEBhMCSEswggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOTXFoGLlApApLbDjQWIPdpE7Q
-3f2+ojaX6m1p4np3EvsBha3MSI2svFxIgUEAqqCZRmJfING/1kPWCT8uw9capS3b
-88atrFdKLxtestIpUN/8Uh/KlL39NFjo4K4Q9A+Jg7rI4eUvIcCPwV5JNzu/NKAJ
-whAaOc1zc025wcnU4x9WhMqLHzqMcp1XVuS+t/TZTQWIYVKPvCkbH2bVNlupLEWw
-g2kyjYLRSDNFXSkqQQE9F1wVr7heu8pvYODljI+nS5muSr+9QL1xDsOlLwLXsG8m
-QERuMBDQo5htw22ANeSLAJCuCXfQkFZPiFIwb4R9TYqh3tNpROvp8y4JdPB9AgMB
-AAGjggHlMIIB4TAdBgNVHQ4EFgQU1qBTCpZSTz0YAcbJopMI7ddhGn8wCQYDVR0T
+c2gtY29yZG92YTETMBEGA1UECwwKVjUyOVhFUE1YVDELMAkGA1UEBhMCVVMwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrqFwrWaX9QAro1Nx73We8bClY
+WNsxKClgvlZk7Ct7MywF9mJgan48mBclax7CYO2v5GIp1pdStoEAh+jZp/fjJBOE
+d+LsWNXPoWVlGeU33/6CsthSd+evFR9/Vlztk4/3pw4VVw1dOL2xdMRzIwh3gImc
+2y+1f5G5cXi8sRcN4nEUyzMctOpmS38DFOLQPUNzhjc0PeHOEn4GIYVfn8V5/ENR
+hhb62suU2FaZ4hmIasFFR+3Vfpgf9n4DzaEPePwSVXFwH1O9C37Umm24tYLU7SrB
+DzqPYAuBwpTTTCPPy9+J+imqt8rx/XE+3hTG8z+UqYByE14iaV657bIzPwdBAgMB
+AAGjggHlMIIB4TAdBgNVHQ4EFgQUN4iORq6c1tBlWAwIV/0pENwcANgwCQYDVR0T
 BAIwADAfBgNVHSMEGDAWgBSIJxcJqbYYYIvs67r2R1nFUlSjtzCCAQ8GA1UdIASC
 AQYwggECMIH/BgkqhkiG92NkBQEwgfEwgcMGCCsGAQUFBwICMIG2DIGzUmVsaWFu
 Y2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNzdW1lcyBhY2Nl
@@ -51,46 +51,46 @@ public function load(ObjectManager $manager)
 Ly93d3cuYXBwbGUuY29tL2FwcGxlY2EvME0GA1UdHwRGMEQwQqBAoD6GPGh0dHA6
 Ly9kZXZlbG9wZXIuYXBwbGUuY29tL2NlcnRpZmljYXRpb25hdXRob3JpdHkvd3dk
 cmNhLmNybDALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwIwEAYKKoZI
-hvdjZAYDAQQCBQAwDQYJKoZIhvcNAQEFBQADggEBAL74/xJhFYFG+8cg/7GktMko
-XaX7Ed01z57y0BxaRsPjhtt9c2chj9nON6SNznaxrDk7pM0jvVDWlI4zPTh5cv5V
-hNe/rJoQivkgpEwghyb77gGnpI+mxJgZu3QCB3otBA43uRsHSBcqFD77thviCsM8
-Y9g3iv9CURhQQJWGbyZg3EJiRQGmzvrRWoerNbNaALmAxALz+abMdevA3Mh2zZe5
-rTStuKUkYMm0GFly7GTgHnkEh2GdeKF9+POUJ309TDi0K81EkVK5F12G39sugE2g
-BXskD0MVbXgKXVqFdr9DZ/WIIGhryH/vlgc92K64u8edHOqqi7Fay4oHVBKjIoA=
+hvdjZAYDAQQCBQAwDQYJKoZIhvcNAQEFBQADggEBAIL1CzGDaULYBMi7tWjknHhE
+Ld9MuMadQHbvPBFCqQ7hJ1b4w9Xi9tMBaVm0eIV29evRXt4OLsBhCdUhPcNLgXeh
+HatX3oHuCiThQoEZMOpO35wh0ZxCX5VTH7J/hhlHDyXL9TwOBtOJ0aciV/EGrRA6
+KvLvjiddFhVo27OtbRFIIQA+4pHmQc1/z7t0Io+ArEypYVdDxR+QgoouVh7OM+Fs
+iyZBLRaXBz0ivlyosiERAC/Bj4aciertdWaSjrBaV+rG/jj0mWNpbdtbdYs4yRMw
+wx5Psn+NbLq+nkxhgTRfYV5/UuXu3GTAxPaXORj3ig0kAxdQA5mnu0+i09A/5WI=
 -----END CERTIFICATE-----
 Bag Attributes
-    friendlyName: PushPluginDemo
-    localKeyID: D6 A0 53 0A 96 52 4F 3D 18 01 C6 C9 A2 93 08 ED D7 61 1A 7F
-Key Attributes: <No Attributes>
+    friendlyName: PantaRei Design
+        localKeyID: 37 88 8E 46 AE 9C D6 D0 65 58 0C 08 57 FD 29 10 DC 1C 00 D8 
+        Key Attributes: <No Attributes>
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,3D63E52C053D0409
+DEK-Info: DES-EDE3-CBC,33DEC333D3450708
 
-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
+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
 -----END RSA PRIVATE KEY-----
 EOF
         ,