Small test tweaks

These do not affect the tests, but just improve clarity or similar.