More style fixes in tests