organisation: update templates and tests for many themes in working groups

Since themes are now in a many to many relationship with working
groups that must be reflected in both templates and tests.