BUGFIX - mask_kwargs was being over-written with defaults

[EddyCMWF]

Bugfix + unit tests for mask_kwargs and all_touched.

Additional bugfix for kwargs being remembered in subsequent calls to method