Devfix

This tests has updates for locator changes on dev. Two of the tests fail because the links are not on dev. I decided not to xfail those tests yet. I'll file a bug  for those links to be added on dev.