This PR polishes some tests a bit.