move custom.css into stylesheet.css, fix failing tests