Updated tests to use proper findvalue function