Minor fixes for async tests