addding lettuce-based tests
manual fix for trivial merge conflict