[jb] Cleanup tests to be less flaky