Working on correcting calls edit positioning
* There is still one failing test now