fix tests and start fixing css classes