Add stability around possible async timing issues, and response tests