move layout tests to scaffold
fix tests