Better handling NULL values
Extended test (due to NULL values)