Adding test for nulls
Correcting indentation