test fixes
test fixes; convert nulls -> None