layout
resolver, fixing headless tests
fix tests on headless