Improving basic assertions.
Refactored Prop