Lint test suite
Merge pull request #14 from wcandillon/lint

Lint test suite
Merge branch 'master' into composition
Fix linting