Last of the ref tests.
Merge pull request #187 from shans/update-MORE-tests

Last of the ref tests.