added new scenarios for bug 1001609