Improved behavior of set/andSet expectation methods

Behavior implementation based on docs
Merge pull request #382 from augusteiner/master

Improved behavior of set/andSet expectation methods