Merge pull request #10 from wcandillon/composition

Move test files