FIXED : #24 : Clean dead code
ADDED : #24 : Unit Tests