Cleaned up async test code