FEATURE: proper Tests had been implemented
FEATURE: the code updated to satisfy the exercises questions.