added testcases for tickets 2550 and 2553