Adding comments and some additional test cases