Test code was out of date.  Updating
Merge pull request #236 from pfschwartz/develop

Test code was out of date.  Updating