fix indents, add tests for null values