Will fix TSUN-286

Add 2 more tests to increase coverage