Edit test for the new layout
merge with master
fix tests