Added test cases for issue #8930