Adding match lookup and return value, test works now.