Minor fixes for various tests.