Fix bug 19840, where some tests were not testing what we wanted. Thanks to Eric for the bug report