Make e2e tests wait for valid responses
Additional fixes