Minor fixes for kitchen tests.