Merge pull request #23 from wcandillon/refactoring

Refactoring
Update test suite