Updated class names in test helper