Update disease mappings and test data

See individual commits