Improve tests
Improve expr tests

Generate random lookup function