Added expected_value and return_values options to put_attributes