Bug fixed

Renamed functions to remove comment smell and make more understandable
Wrote tests for newly named functions