Fix up renamed class in tests