Merge pull request #1444 from shackbarth/tests