Added tests, stop converting NULLs to NA.