diff --git a/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java b/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java
deleted file mode 100644
index 79cc496e2..000000000
--- a/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.util;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.util.MathUtils;
-
-public class MathUtilsTest {
-
-    @Test
-    public void Sum() {
-        assertEquals(Integer.valueOf(5), MathUtils.sum(2, 3.0));
-    }
-
-    @Test
-    public void Difference() {
-        assertEquals(Integer.valueOf(2), MathUtils.difference(5, 3.0));
-    }
-
-    @Test
-    public void Cast_Integer_To_Long() {
-        assertEquals(Long.valueOf(2), MathUtils.cast(2, Long.class));
-    }
-
-    @Test
-    public void Cast_Double_To_Long() {
-        assertEquals(Long.valueOf(3), MathUtils.cast(3.2, Long.class));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java b/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java
index 06b4cdd8f..6ed5ea139 100644
--- a/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java
+++ b/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java
@@ -22,6 +22,16 @@ import org.junit.Test;
 
 public class MathUtilsTest {
 
+    @Test
+    public void Sum() {
+        assertEquals(Integer.valueOf(5), MathUtils.sum(2, 3.0));
+    }
+
+    @Test
+    public void Difference() {
+        assertEquals(Integer.valueOf(2), MathUtils.difference(5, 3.0));
+    }
+
     @Test
     public void Cast() {
         Integer value = Integer.valueOf(1);
@@ -33,6 +43,15 @@ public class MathUtilsTest {
         assertEquals(Long.class, MathUtils.cast(value, Long.class).getClass());
         assertEquals(Short.class, MathUtils.cast(value, Short.class).getClass());
         assertEquals(Byte.class, MathUtils.cast(value, Byte.class).getClass());
+
+        assertEquals(BigDecimal.ONE, MathUtils.cast(value, BigDecimal.class));
+        assertEquals(BigInteger.ONE, MathUtils.cast(value, BigInteger.class));
+        assertEquals(Double.valueOf(1), MathUtils.cast(value, Double.class));
+        assertEquals(Float.valueOf(1), MathUtils.cast(value, Float.class));
+        assertEquals(Integer.valueOf(1), MathUtils.cast(value, Integer.class));
+        assertEquals(Long.valueOf(1), MathUtils.cast(value, Long.class));
+        assertEquals(Short.valueOf((short) 1), MathUtils.cast(value, Short.class));
+        assertEquals(Byte.valueOf((byte) 1), MathUtils.cast(value, Byte.class));
     }
 
 }