Testing updates
Merge pull request #55 from GrahamCampbell/testing

Test Updates