Fixes to number box causing symptoms in DAWNSCI-580 (and more tests)