This change is unrelated, but the tests were failing. I made the test more generic.