Fix failing style tests