UCSF: improve shuttle test
Merge branch 'master' of github.com:Trott/CampusKit