Using props and state
Not using props in the property lookup
Fixed tests