diff --git a/test_transform.py b/test_transform.py
index 2ced4a6..5465ca3 100644
--- a/test_transform.py
+++ b/test_transform.py
@@ -12,8 +12,9 @@ from transform import (
 def test(function, arguments, expected):
     observed = function(*arguments)
     if observed != expected:
+        fname = function.__name__
         args = ', '.join(str(arg) for arg in arguments) 
-        print(f"Error: Expected {function}({args}) to equal {expected}, but it was {observed}")
+        print(f"Error: Expected {fname}({args}) to equal {expected}, but it was {observed}")
 
 test(maximum, [[0, 1, 2, 3]], 3)
 test(maximum, [[-10, -20, -30]], -10)
@@ -21,14 +22,14 @@ test(minimum, [[0, 1, 2, 3]], 0)
 test(minimum, [[-10, -20, -30]], -30)
 test(bounds, [[0, 1, 2, 3]], [0, 3])
 test(bounds, [[-10, -20, -30]], [-30, -10])
-test(clamp, [[10, 0, 100]], 10)
-test(clamp, [[-10, 0, 100]], 0)
-test(clamp, [[104, 0, 100]], 100)
-test(ratio, [[5, 0, 10]], 0.5)
-test(ratio, [[167, 100, 200]], 0.67)
-test(ratio, [[8, 10, 0]], 0.2)
-test(ratio, [[4, 10, 20]], 0.0)
-test(scale, [[4, 0, 10, 0, 100]], 40)
-test(scale, [[160, 120, 240, 0, 100]], 100/3)
+test(clamp, [10, 0, 100], 10)
+test(clamp, [-10, 0, 100], 0)
+test(clamp, [104, 0, 100], 100)
+test(ratio, [5, 0, 10], 0.5)
+test(ratio, [167, 100, 200], 0.67)
+test(ratio, [8, 10, 0], 0.2)
+test(ratio, [4, 10, 20], 0.0)
+test(scale, [4, 0, 10, 0, 100], 40)
+test(scale, [180, 120, 240, 0, 100], 50)
 test(get_x_values, [[[0, 5], [1, 5], [2, 5]]], [0, 1, 2])
 test(get_y_values, [[[0, 5], [1, 5], [2, 5]]], [5, 5, 5])
diff --git a/transform.py b/transform.py
index c1fb829..d97fbf8 100644
--- a/transform.py
+++ b/transform.py
@@ -32,7 +32,8 @@ def ratio(value, start, end):
 
 def scale(value, domain_min, domain_max, range_min, range_max):
     "Given a value within a domain, returns the scaled equivalent within range."
-    return range_min + ratio(value, domain_min, domain_max) * (range_max - range_min)
+    r = clamp(ratio(value, domain_min, domain_max), 0, 1)
+    return range_min + r * (range_max - range_min)
 
 def get_x_values(points):
     "Returns the first value for each point in points."