fir for issue#308 - Added new test cases