Some cs fixes.

I know it's not really needed for `Test`, but I stumbled upon them and I couldn't resist...