Test/styling fixes

More styling tests :)