Mediator response fixes

Fixes #223 

This is just an 8 line fix (with a 100 lines of test code!), so with @rcrichton out - @debonair and @BMartinos, would you guys mind just doing a quick sanity check on this for me?