Merge "Move tests to use simple_layout" into feature/zuulv3