Added spacing to test output
Replaced empty strings with NULLs.