(#2636) - add lots of tests, including a failing one