Another lettuce test, and fixes to make it work