Update tests according to chapter five exercises