2 lettuces test still fail and code needs lots of cleanup