updated tests to use new class names