Fixes for test-kitchen