Improved mock proxy behaviour. Closes #8.