Update unit tests for class name change