Fixing tests and class name