Reduce flakiness by improving some checks to ensure the app is ready.

Reduce flakiness by improving some checks to ensure the app is ready. #159