Changed the layout, use different test library