Fix flickering test:
* Better wait for step to be visible not just present.
* Wait for step to load when going to the previous step because the previous step is reinitialized.