Changed unit tests so that null values are allowed