some reformatting and added tests with nulls
2 files changed