Simplify squares in notation test
Fix square conversion
Revert Jcpi to Pulse