Made test less fragile
Merge branch 'master' of github.com:ucdavis/ACE