fixing unit tests for notation shift
Merge branch 'notation-shift'