Finalised styles and updated tests