More style fixes for group tests