More testing, planning async api