Set URI in tests so ug/pg work
Fix more tests
Merge branch 'feature/refactor-ug-pg-logic' of github.com:unikent/programmes-plant into feature/refactor-ug-pg-logic