Merge pull request #3952 from akoeplinger/add-tests