Improve Selenium test by adding waits until next page loads and xpath that does not rely on element IDs.