CS fixes on specs
Fix some CS problems after last merges
Merge pull request #1775 from stloyd/bugfix/cs

Fix some CS problems after last merges
Merge pull request #1702 from aRn0D/phpspec-cs-fix

CS fixes on specs