Make this test case a little more resilient to class name changes