Using correct class names for the unit tests in - TRUNK-3912 (cherry picked from commit 2988ceff05fb97dd5dd67d75cc2f03ec96f5f48b)