Add testing
Improve async code
Remove useless
Pass tests