Added more test layout