Misc improvements to make lettuce testing a bit saner