Adding layout, style and improving tests