Patch ensure_* tests
Merge pull request #277 from hunner/update_ensure

Patch ensure_* tests