Use ActorStrategy in unit tests
Restore envelope clean up on each poll() call