Added Test Cases and changed return Methodology
Removed Comments that were not in Style