Improved behavior of set/andSet expectation methods

Behavior implementation based on docs