Revert "Write with-stub in terms of a fn"

This reverts commit a4322347bd529425c6a900135cca7cde4097dec6.
Add tests
Bump the version