update tests. fix bug with nil values.