Merge pull request #4847 from noahp/noahp/null-arg-fixes tests: 🌀 address two null argument instances