issue 2215 added additional test cases