layout
some tests fixed