ADDED : #24 : UnitTests (65.60% Lines)