Fixed some test failures
Merge pull request #496 from peastman/master

Fixed some test failures