Handle multiple calls of flat_map() etc.
Use _add_cb anywhere
Improve in the speed of tests

Sleep only for 50ms
Add changes