Tidies some unit tests a bit.