fixed test to new class names