Minor fixes for tests that broke due to changes elsewhere in the code.