Test cases need more refactoring also there will be more test cases for negative scenarios. I'll assign it for myself. @thomedpete add me as assignee