port touched tests to use @aelgru's fluentmock