Adapted test to pull request #87