WIP moving supersedes changes to lettuce tests