this fixes a few tests and slice notation, just realized I was on the wrong branch
Merge branch 'feature/ShapeContext' into develop