added null skip
added resolved condition
minor copy edits
adding rejection tests
refactoring