Tests and fix for issue #137.

Another one attempt to pull the fix request for 'observe' mapping behaviour.