Added test cases #308