Fixing class name
Fixing tests class names