added more scenarios for github issue 189