Update organisations ID query, test data, and context for new properties

See #210.