Consolidate more lit tests.