Fix and Convert more lettuce tests.