Failing tests for #with behavior
Fix #with
Merge branch 'shark' into devel