Using correct class names for the unit tests in - TRUNK-3912