Testing tweaks
Merge pull request #207 from GrahamCampbell/testing-tweaks

Testing Tweaks