Merge "Revert "Introduce test-kitchen""