Few issue #8 related test cases