fixes to test
refactor layout