Added tests for null values