Minor CS fixes in src
Fixing CS in the test suite
Merge pull request #7 from Ocramius/hotfix/cs

Various CS fixes