Updated tests.
Merge pull request #1 from nigelgbanks/7.x-CWRC-25

Updated tests.