layout and tests fixed