Merge "Improved kitchen tests logging"