Modified the class and it's respective test class.