Merge pull request #196 from fpapon/ASYNC_TEST

[SHIRO-735] Add tests