diff --git a/core/field_angle.js b/core/field_angle.js
index 7e88f154c..415662a08 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -173,6 +173,7 @@ Blockly.FieldAngle.prototype.configure_ = function(config) {
     this.clockwise_ = clockwise;
   }
 
+  // If these are passed as null then we should leave them on the default.
   var offset = config['offset'];
   if (offset != null) {
     offset = Number(offset);
diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js
index 1a4d9f700..56d8aaa0d 100644
--- a/tests/mocha/field_number_test.js
+++ b/tests/mocha/field_number_test.js
@@ -247,11 +247,10 @@ suite('Number Fields', function() {
           numberField.setValue(123.456);
           assertValue(numberField, 123);
         });
-        test('null', function() {
+        test('Null', function() {
           var numberField = new Blockly.FieldNumber
               .fromJson({ precision: null});
-          numberField.setValue(123.456);
-          assertValue(numberField, 123.456);
+          assertEquals(numberField.getPrecision(), 0);
         });
       });
       suite('Min', function() {
@@ -282,11 +281,10 @@ suite('Number Fields', function() {
           numberField.setValue(20);
           assertValue(numberField, 20);
         });
-        test('null', function() {
+        test('Null', function() {
           var numberField = new Blockly.FieldNumber
               .fromJson({ min: null});
-          numberField.setValue(-20);
-          assertValue(numberField, -20);
+          assertEquals(numberField.getMin(), -Infinity);
         });
       });
       suite('Max', function() {
@@ -320,8 +318,7 @@ suite('Number Fields', function() {
         test('null', function() {
           var numberField = new Blockly.FieldNumber
               .fromJson({ max: null});
-          numberField.setValue(20);
-          assertValue(numberField, 20);
+          assertEquals(numberField.getMax(), Infinity);
         });
       });
     });