Some Corrections + Tests Implementation