Improved Smell Class
Inittial passing tests