reorganize and add css test