New test-kitchen aliases
Fix typo
Fix merge conflicts