Testing improvements
Merge pull request #378 from GrahamCampbell/travis

Testing Improvements