improve testcase for ticket 2607