Test Class
Fixing names