Merge pull request #752 from eileenmcnaughton/test-fix