Updated tests to new class names