Improve performance tests
Async cases, with tests