Improved testing
CS fixes
Merge pull request #280 from GrahamCampbell/cs

CS Fixes