Renamed skip_if_null to skip_if

- Now checks for the value and skips
- Added unit tests