Focal double ops

Adds some tests and some fixes to Mark's PR to fix #630.