Tests cs fixes
Merge pull request #257 from GrahamCampbell/tests-cs-fixes

Tests CS Fixes