minor changes before extracting contextOperation property from SAOperation
Extract contextOperation to a category
more tests