Merge "Improve IME test naming"