Merge pull request #152 from xi-project/cleanup-crew

PSR- and other clean ups.
Merge pull request #153 from xi-project/test-coverage-bettering

Test coverage bettering
Merge remote-tracking branch 'origin/master' into test-coverage-bettering
Bettered tests.