Tests for Bug-975910 as per review comments

Modified the tests as per review comments for Bug-975910