Update tests to fix async issue