Updated some of the tests.
Merge branch 'master' of github.com:ucdavis/ACE