updating tests to new class names