fixed tests to new class names