Updated tests with new class names