Adding comments
Added more tests