Don't pass the value-fn when we already have a boolean
add test case