Changed some files for enabling test-kitchen