diff --git a/SpotifyAPI.Tests/SpotifyAPI.Tests.csproj b/SpotifyAPI.Tests/SpotifyAPI.Tests.csproj
index 528cecaf..51203cdd 100644
--- a/SpotifyAPI.Tests/SpotifyAPI.Tests.csproj
+++ b/SpotifyAPI.Tests/SpotifyAPI.Tests.csproj
@@ -56,8 +56,9 @@
   <ItemGroup>
     <Compile Include="ProxyConfigTest.cs" />
     <Compile Include="SpotifyUriTest.cs" />
-    <Compile Include="TestClass.cs" />
+    <Compile Include="SpotifyWebAPITest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UtilTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SpotifyAPI\SpotifyAPI.csproj">
diff --git a/SpotifyAPI.Tests/SpotifyUriTest.cs b/SpotifyAPI.Tests/SpotifyUriTest.cs
index 395173a3..9326a626 100644
--- a/SpotifyAPI.Tests/SpotifyUriTest.cs
+++ b/SpotifyAPI.Tests/SpotifyUriTest.cs
@@ -1,16 +1,11 @@
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using SpotifyAPI.Local;
+using NUnit.Framework;
 using SpotifyAPI.Local.Models;
 using SpotifyAPI.Local.Enums;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 
 namespace SpotifyAPI.Tests
 {
+    [TestFixture]
     public class SpotifyUriTest
     {
         [Test]
diff --git a/SpotifyAPI.Tests/TestClass.cs b/SpotifyAPI.Tests/SpotifyWebAPITest.cs
similarity index 98%
rename from SpotifyAPI.Tests/TestClass.cs
rename to SpotifyAPI.Tests/SpotifyWebAPITest.cs
index eaf99f49..a07c585b 100644
--- a/SpotifyAPI.Tests/TestClass.cs
+++ b/SpotifyAPI.Tests/SpotifyWebAPITest.cs
@@ -11,7 +11,7 @@ using System.Linq;
 namespace SpotifyAPI.Tests
 {
     [TestFixture]
-    public class TestClass
+    public class SpotifyWebAPITest
     {
         private static readonly string FixtureDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../../fixtures/");
 
diff --git a/SpotifyAPI.Tests/UtilTest.cs b/SpotifyAPI.Tests/UtilTest.cs
new file mode 100644
index 00000000..c78c14ae
--- /dev/null
+++ b/SpotifyAPI.Tests/UtilTest.cs
@@ -0,0 +1,19 @@
+using System;
+using NUnit.Framework;
+using SpotifyAPI.Web;
+
+namespace SpotifyAPI.Tests
+{
+    [TestFixture]
+    public class UtilTest
+    {
+        [Test]
+        public void TimestampShouldBeNoFloatingPoint()
+        {
+            string timestamp = DateTime.Now.ToUnixTimeMillisecondsPoly().ToString();
+
+            StringAssert.DoesNotContain(".", timestamp);
+            StringAssert.DoesNotContain(",", timestamp);
+        }
+    }
+}
\ No newline at end of file