Simplify test CSS and markup