fix to tests to reflect new class names