ENG-4825: Fix broken tests. Tweak parameter conversion.
Fixed one conversion bug and changed some null handling code.
Fixed 3 whacko tests.