Re-enable more async tests and fix bugs