Removed nil check

Other changes
- Removed tests checking for the nil check