Finish styles and add additional tests