Cleaned the code and rewritten test #168

Closed nancy-binani closed 1 year ago