ADDED : UnitTests (87.27% Lines)