Add more unit tests.  Refs #4749.
Merge branch 'feature/6749_import_fp_irf' into develop