Response to code review and adding some more tests