Refactoring some unit tests
Merge pull request #86 from sebastienros/sebastienros/refactoring

Refactoring some unit tests