Add more unit tests. Refs #6746.
Merge branch 'feature/6746_cal_rwp' into develop