This is a followup to the last commit, which was about issue #328. These tests are taken from the original #328 pull request, with updated expectations where applicable. Review-by: Matthew Martin