Add tests re #23

- Simplify the return value for lookup_value