PR: Adding sad path test & removing comments