Clean up async test solution. Fixes #969