backout fix for 221, add 2 new tests