cf async mods
Revert "more testimo changes"

This reverts commit 06a4e5bb8c455c3c583f955e0691d017118af054.