Corrected unit tests on null return values