Changes to stylecheck and generictest