Added test cases (not complete yet)