Tidy up formatting for feature tests