Removing null from unit tests