Improved behaviour of set/andSet expectation methods

Behaviour implementation based on docs