Cleaning up. Single formula in the IDF. Better test. Refs #6850