Tests and css cleanup