#2860 - Adding extra test-cases