Add tests re #23

- Simplify the return value for lookup_value
Simplify the lookups
merge master
fix identifier lookup regression on merge
Switch from Grunt to Gulp