Use stable test IDs instead of classes

[carbonrobot]

Modify test cases to use a more stable assertion so class name changes do not break tests