rename method used in test, move into diff test class to skip container
merge master into branch
Merge branch 'master' of github.com:ooici/coi-services into preload_alerts
Merge pull request #941 from newbrough/preload_alerts

rename method used in test, move into diff test class to skip container