more tests, and consolidate css