Test style fixes