diff --git a/PushSharp.Amazon.Adm/PushSharp.Amazon.Adm.csproj b/PushSharp.Amazon.Adm/PushSharp.Amazon.Adm.csproj
index b14772fa..fa64852b 100644
--- a/PushSharp.Amazon.Adm/PushSharp.Amazon.Adm.csproj
+++ b/PushSharp.Amazon.Adm/PushSharp.Amazon.Adm.csproj
@@ -9,6 +9,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>PushSharp.Amazon.Adm</RootNamespace>
     <AssemblyName>PushSharp.Amazon.Adm</AssemblyName>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,4 +61,5 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
\ No newline at end of file
diff --git a/PushSharp.Blackberry/PushSharp.Blackberry.csproj b/PushSharp.Blackberry/PushSharp.Blackberry.csproj
index 83a7a5bf..0e93cc9f 100644
--- a/PushSharp.Blackberry/PushSharp.Blackberry.csproj
+++ b/PushSharp.Blackberry/PushSharp.Blackberry.csproj
@@ -11,6 +11,8 @@
     <RootNamespace>PushSharp.Blackberry</RootNamespace>
     <AssemblyName>PushSharp.Blackberry</AssemblyName>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,6 +90,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PushSharp.Google.Chrome/ChromePushBrokerExtensions.cs b/PushSharp.Google.Chrome/ChromePushBrokerExtensions.cs
new file mode 100644
index 00000000..ffe5f1a2
--- /dev/null
+++ b/PushSharp.Google.Chrome/ChromePushBrokerExtensions.cs
@@ -0,0 +1,18 @@
+using PushSharp.Google.Chrome;
+using PushSharp.Core;
+
+namespace PushSharp
+{
+    public static class ChromePushBrokerExtensions
+    {
+        public static void RegisterChromeGcmService(this PushBroker broker, ChromePushChannelSettings channelSettings, IPushServiceSettings serviceSettings = null)
+        {
+            broker.RegisterService<ChromeNotification>(new ChromePushService(channelSettings, serviceSettings));
+        }
+
+        public static ChromeNotification BlackberryNotification(this PushBroker broker)
+        {
+            return new ChromeNotification();
+        }
+    }
+}
diff --git a/PushSharp.Google.Chrome/ChromePushChannel.cs b/PushSharp.Google.Chrome/ChromePushChannel.cs
index 0dc27ac1..78f708ca 100644
--- a/PushSharp.Google.Chrome/ChromePushChannel.cs
+++ b/PushSharp.Google.Chrome/ChromePushChannel.cs
@@ -7,11 +7,12 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Security;
 using System.Net.Security;
-
+using System.Web;
 using PushSharp.Core;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
 
 namespace PushSharp.Google.Chrome
 {
@@ -26,6 +27,8 @@ public class ChromePushChannel : IPushChannel
 
 		public ChromePushChannel(ChromePushChannelSettings channelSettings)
 		{
+		    Expires = DateTime.UtcNow.AddYears(-1);
+		    AccessToken = string.Empty;
 			chromeSettings = channelSettings as ChromePushChannelSettings;	
 		}
 
@@ -38,16 +41,25 @@ public void RefreshAccessToken()
 		{
 			var p = new Dictionary<string, string> ();
 
-			p.Add ("client_id", chromeSettings.ClientId);
+            p.Add ("client_id", chromeSettings.ClientId);
 			p.Add ("client_secret", chromeSettings.ClientSecret);
 			p.Add ("refresh_token", chromeSettings.RefreshToken);
-			p.Add ("grant_type", chromeSettings.GrantType);
+		    p.Add("grant_type", "refresh_token");
 
 			var response = http.PostAsync (chromeSettings.AuthUrl, new FormUrlEncodedContent (p)).Result;
 
 			var result = response.Content.ReadAsStringAsync ().Result;
 
-			Console.WriteLine ("RESPONSE: " + result);
+		    var json = JObject.Parse(result);
+
+		    this.AccessToken = json["access_token"].ToString();
+
+            JToken expiresJson = new JValue(3400);
+		    json.TryGetValue("expires_in", out expiresJson);
+
+		    this.Expires = DateTime.UtcNow.AddSeconds(expiresJson.Value<int>());
+
+            http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", this.AccessToken);
 		}
 
 		public void SendNotification(INotification notification, SendNotificationCallbackDelegate callback)
@@ -59,19 +71,20 @@ public void SendNotification(INotification notification, SendNotificationCallbac
 
 			try
 			{
-				var client = new HttpClient ();
-
-				var url = chromeSettings.Url;
-
-				var sc = new StringContent(string.Empty);
+                if (string.IsNullOrEmpty(this.AccessToken) || DateTime.UtcNow >= this.Expires)
+                    RefreshAccessToken();
+                
+			    var json = new JObject();
+			    json["channelId"] = n.ChannelId;
+			    json["subchannelId"] = ((int)n.SubChannelId).ToString();
+			    json["payload"] = n.Payload;
+                
+				var sc = new StringContent(json.ToString());
 				sc.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-				sc.Headers.TryAddWithoutValidation("Authorization", "Bearer " + chromeSettings.GrantType);
-				sc.Headers.TryAddWithoutValidation ("channelId", n.ChannelId);
-				sc.Headers.TryAddWithoutValidation ("subchannelId", ((int)n.SubChannelId).ToString());
-				sc.Headers.TryAddWithoutValidation ("payload", n.Payload);
-
-
-				var result = client.PostAsync (chromeSettings.Url, sc).Result;
+                
+				sc.Headers.TryAddWithoutValidation("Authorization", "Bearer " + this.AccessToken);
+				
+				var result = http.PostAsync (chromeSettings.Url, sc).Result;
 
 				success = result.IsSuccessStatusCode;
 
diff --git a/PushSharp.Google.Chrome/ChromePushChannelSettings.cs b/PushSharp.Google.Chrome/ChromePushChannelSettings.cs
index 83832415..ea603ebe 100644
--- a/PushSharp.Google.Chrome/ChromePushChannelSettings.cs
+++ b/PushSharp.Google.Chrome/ChromePushChannelSettings.cs
@@ -8,7 +8,7 @@ namespace PushSharp.Google.Chrome
 	public class ChromePushChannelSettings : IPushChannelSettings
 	{
 		private const string CHROME_SEND_URL = "https://www.googleapis.com/gcm_for_chrome/v1/messages";
-		private const string CHROME_AUTH_URL = "https://accounts.google.com/o/auth2/auth";
+		private const string CHROME_AUTH_URL = "https://accounts.google.com/o/oauth2/token";
 
 		public ChromePushChannelSettings(string clientId, string clientSecret)
 		{
@@ -23,7 +23,7 @@ public ChromePushChannelSettings(string clientId, string clientSecret)
 		public string ClientSecret { get; private set; }
 
 		public string RefreshToken { get; set; }
-		public string GrantType { get; set; }
+		public string AuthorizationCode { get; set; }
 
 		public string Url { get; private set; }
 		public string AuthUrl { get; private set; }
diff --git a/PushSharp.Google.Chrome/PushSharp.Google.Chrome.csproj b/PushSharp.Google.Chrome/PushSharp.Google.Chrome.csproj
index d304a214..4edea726 100644
--- a/PushSharp.Google.Chrome/PushSharp.Google.Chrome.csproj
+++ b/PushSharp.Google.Chrome/PushSharp.Google.Chrome.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,6 +9,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>PushSharp.Google.Chrome</RootNamespace>
     <AssemblyName>PushSharp.Google.Chrome</AssemblyName>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,6 +29,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http.WebRequest">
@@ -35,8 +40,10 @@
     <Reference Include="System.Net.Http">
       <HintPath>..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ChromePushBrokerExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ChromePushService.cs" />
     <Compile Include="ChromeNotification.cs" />
@@ -55,4 +62,5 @@
       <Name>PushSharp.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
\ No newline at end of file
diff --git a/PushSharp.Google.Chrome/packages.config b/PushSharp.Google.Chrome/packages.config
index 99932b36..7566cc07 100644
--- a/PushSharp.Google.Chrome/packages.config
+++ b/PushSharp.Google.Chrome/packages.config
@@ -4,4 +4,5 @@
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/PushSharp.sln b/PushSharp.sln
index 3f28354c..2711b6e2 100644
--- a/PushSharp.sln
+++ b/PushSharp.sln
@@ -12,8 +12,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.WindowsPhone", "PushSharp.WindowsPhone\PushSharp.WindowsPhone.csproj", "{9947F510-BA9A-4045-A648-BAB687D8F513}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Google.Chrome", "PushSharp.Google.Chrome\PushSharp.Google.Chrome.csproj", "{84961658-42B9-4943-B738-ABED75EDE303}"
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Amazon.Adm", "PushSharp.Amazon.Adm\PushSharp.Amazon.Adm.csproj", "{52154303-5315-494C-A741-2F0998795DC3}"
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Blackberry", "PushSharp.Blackberry\PushSharp.Blackberry.csproj", "{5250980B-BD11-4201-B083-AEDB8C62C471}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Amazon.Adm", "PushSharp.Amazon.Adm\PushSharp.Amazon.Adm.csproj", "{52154303-5315-494C-A741-2F0998795DC3}"
 EndProject
@@ -47,46 +45,26 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52154303-5315-494C-A741-2F0998795DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52154303-5315-494C-A741-2F0998795DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52154303-5315-494C-A741-2F0998795DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52154303-5315-494C-A741-2F0998795DC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83C67156-893D-4AFF-9169-DB34771989CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83C67156-893D-4AFF-9169-DB34771989CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83C67156-893D-4AFF-9169-DB34771989CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83C67156-893D-4AFF-9169-DB34771989CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84961658-42B9-4943-B738-ABED75EDE303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84961658-42B9-4943-B738-ABED75EDE303}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84961658-42B9-4943-B738-ABED75EDE303}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84961658-42B9-4943-B738-ABED75EDE303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EC3A31E-B869-4465-ABDC-90C2E3CCC17D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84961658-42B9-4943-B738-ABED75EDE303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84961658-42B9-4943-B738-ABED75EDE303}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84961658-42B9-4943-B738-ABED75EDE303}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84961658-42B9-4943-B738-ABED75EDE303}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52154303-5315-494C-A741-2F0998795DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52154303-5315-494C-A741-2F0998795DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52154303-5315-494C-A741-2F0998795DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,6 +73,21 @@ Global
 		{5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39313686-9B5F-4680-9D5C-373C3E2C87CF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{83C67156-893D-4AFF-9169-DB34771989CB} = {C09BBA3E-9CF3-4479-A4C3-3006820E2046}
@@ -110,7 +103,4 @@ Global
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = PushSharp.Sample\PushSharp.Sample.csproj
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 EndGlobal
diff --git a/Tests/PushSharp.Tests/GcmChromeTests.cs b/Tests/PushSharp.Tests/GcmChromeTests.cs
index 1238ed60..179aa8d2 100644
--- a/Tests/PushSharp.Tests/GcmChromeTests.cs
+++ b/Tests/PushSharp.Tests/GcmChromeTests.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using PushSharp.Google.Chrome;
+using System.Threading;
 
 namespace PushSharp.Tests
 {
@@ -17,11 +19,26 @@ public GcmChromeTests ()
 		[Test]
 		public void TestOAuth()
 		{
+			//var wait = new ManualResetEvent(false);
+
 			Google.Chrome.ChromePushChannel chan = new PushSharp.Google.Chrome.ChromePushChannel (new PushSharp.Google.Chrome.ChromePushChannelSettings(oauthClientId, oauthSecret)
             {
-				GrantType = "4/m11YZRjo5yoYyuy3Wx8bIY1NtN3I.kvLUtsadF1YSuJJVnL49Cc_yg3RGfQI", RefreshToken = "1/737Kzd3sjIr8ME97HYam3fPW8euce6lHeP800RUXl8Y"
+                AuthorizationCode = "4/Ndq0smr04tldagzUcJa9MFdamaAt.srbbbJRseYMTmmS0T3UFEsOetIXtfQI",
+                RefreshToken = "1/3n7TKFv2xoHNBuKqHEXDLpiBZJVGkExnR1K_uHhU0H4"
 			});
-			chan.RefreshAccessToken ();
+
+			var n = new ChromeNotification ();
+			n.ChannelId = "14952429134341445468/eedjdmpjjhnloopiphclnnecohdbkkpa";
+
+			n.Payload = "{\"test\":\"value\"}";
+
+			var cb = new PushSharp.Core.SendNotificationCallbackDelegate ((sender, response) => {
+				//wait.Set();
+			});
+
+			chan.SendNotification (n, cb);
+
+			//wait.WaitOne ();
 		}
 	}
 }
diff --git a/Tests/PushSharp.Tests/PushSharp.Tests.csproj b/Tests/PushSharp.Tests/PushSharp.Tests.csproj
index 6dffd757..4ee5d48c 100644
--- a/Tests/PushSharp.Tests/PushSharp.Tests.csproj
+++ b/Tests/PushSharp.Tests/PushSharp.Tests.csproj
@@ -14,7 +14,6 @@
     <RestorePackages>true</RestorePackages>
     <ProductVersion>12.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,6 +35,9 @@
     <Reference Include="Moq">
       <HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
@@ -47,9 +49,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppleTests.cs" />
diff --git a/Tests/PushSharp.Tests/packages.config b/Tests/PushSharp.Tests/packages.config
index b5408384..53e25cac 100644
--- a/Tests/PushSharp.Tests/packages.config
+++ b/Tests/PushSharp.Tests/packages.config
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="net45" />
   <package id="Moq" version="4.0.10827" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
-  <package id="NUnit" version="2.6.2" targetFramework="net45" />
+  <package id="NUnit" version="2.6.2" targetFramework="net40" />
 </packages>
\ No newline at end of file