Modified the Tests accordingly to the latest changes in the classes.