testing: remove null check