Added test for null values