DRYing ui tests, adding more. minor fixes