I don't like this.  Why you need to change these tests to fix this bug?