Bring test up to speed with pull request for #28