[UPDATE] Unit Tests
Merge pull request #456 from renaudJennyRBS/review

[UPDATE] Review Unit Tests