Added shortName to Agency calls with additional tests.