more tests. some fixes.
headless test reorg