Updated test messages and class names