fix up tests. slight reorg. fix css naming.