[TASK] Adjust tests to new possible NULL return